declare _gdk_xgrab_check_button_event.

Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>

        * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.

        * gtk/gtkbutton.c: fix signature of gtk_button_grab_broken.

diff --git a/ChangeLog b/ChangeLog
index 2ac66d0ef36a7b457ad83bc03b19589bf55d1bd3..a60d5f71704ca4917ed225d0c26d52db7ce737b5 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
+
+       * gtk/gtkbutton.c: fix signature of gtk_button_grab_broken.
+
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 2ac66d0ef36a7b457ad83bc03b19589bf55d1bd3..a60d5f71704ca4917ed225d0c26d52db7ce737b5 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,9 @@
+Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
+
+       * gtk/gtkbutton.c: fix signature of gtk_button_grab_broken.
+
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 2ac66d0ef36a7b457ad83bc03b19589bf55d1bd3..a60d5f71704ca4917ed225d0c26d52db7ce737b5 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,9 @@
+Thu Jun 30 14:17:24 2005  Manish Singh  <yosh@gimp.org>
+
+       * gdk/x11/gdkprivate-x11.h: declare _gdk_xgrab_check_button_event.
+
+       * gtk/gtkbutton.c: fix signature of gtk_button_grab_broken.
+
 2005-06-30  Matthias Clasen  <mclasen@redhat.com>
 
        * gdk/x11/gdkvisual-x11.c (gdk_visual_decompose_mask): Avoid

diff --git a/gdk/x11/gdkprivate-x11.h b/gdk/x11/gdkprivate-x11.h
index 222ae6ba0fbd847e0b2f605502adc42d3c55f017..4da0d0caa02c77e4be144f94ac46b7ef68fc9f30 100644 (file)
--- a/gdk/x11/gdkprivate-x11.h
+++ b/gdk/x11/gdkprivate-x11.h
@@ -148,9 +148,11 @@ GC _gdk_x11_gc_flush (GdkGC *gc);
 
 void _gdk_x11_initialize_locale (void);
 
-void _gdk_xgrab_check_unmap   (GdkWindow *window,
-                              gulong     serial);
-void _gdk_xgrab_check_destroy (GdkWindow *window);
+void _gdk_xgrab_check_unmap        (GdkWindow *window,
+                                   gulong     serial);
+void _gdk_xgrab_check_destroy      (GdkWindow *window);
+void _gdk_xgrab_check_button_event (GdkWindow *window,
+                                   XEvent    *xevent);
 
 gboolean _gdk_x11_display_is_root_window (GdkDisplay *display,
                                          Window      xroot_window);

diff --git a/gtk/gtkbutton.c b/gtk/gtkbutton.c
index dbf34fb144a5f3fa68299ddecc1cee7790e25c1d..8e961564a95be16df7917316f2434c4a40ef8052 100644 (file)
--- a/gtk/gtkbutton.c
+++ b/gtk/gtkbutton.c
@@ -85,50 +85,50 @@ struct _GtkButtonPrivate
   guint32      grab_time;
 };
 
-static void gtk_button_class_init     (GtkButtonClass   *klass);
-static void gtk_button_init           (GtkButton        *button);
-static void gtk_button_destroy        (GtkObject        *object);
-static void gtk_button_set_property   (GObject         *object,
-                                       guint            prop_id,
-                                       const GValue    *value,
-                                       GParamSpec      *pspec);
-static void gtk_button_get_property   (GObject         *object,
-                                       guint            prop_id,
-                                       GValue          *value,
-                                       GParamSpec      *pspec);
-static void gtk_button_screen_changed (GtkWidget        *widget,
-                                      GdkScreen        *previous_screen);
-static void gtk_button_realize        (GtkWidget        *widget);
-static void gtk_button_unrealize      (GtkWidget        *widget);
-static void gtk_button_map            (GtkWidget        *widget);
-static void gtk_button_unmap          (GtkWidget        *widget);
-static void gtk_button_size_request   (GtkWidget        *widget,
-                                      GtkRequisition   *requisition);
-static void gtk_button_size_allocate  (GtkWidget        *widget,
-                                      GtkAllocation    *allocation);
-static gint gtk_button_expose         (GtkWidget        *widget,
-                                      GdkEventExpose   *event);
-static gint gtk_button_button_press   (GtkWidget        *widget,
-                                      GdkEventButton   *event);
-static gint gtk_button_button_release (GtkWidget        *widget,
-                                      GdkEventButton   *event);
-static gint gtk_button_grab_broken    (GtkWidget        *widget,
-                                      GdkEventAny      *event);
-static gint gtk_button_key_release    (GtkWidget        *widget,
-                                      GdkEventKey      *event);
-static gint gtk_button_enter_notify   (GtkWidget        *widget,
-                                      GdkEventCrossing *event);
-static gint gtk_button_leave_notify   (GtkWidget        *widget,
-                                      GdkEventCrossing *event);
-static void gtk_real_button_pressed   (GtkButton        *button);
-static void gtk_real_button_released  (GtkButton        *button);
-static void gtk_real_button_activate  (GtkButton         *button);
-static void gtk_button_update_state   (GtkButton        *button);
-static void gtk_button_add            (GtkContainer   *container,
-                                      GtkWidget      *widget);
-static GType gtk_button_child_type    (GtkContainer     *container);
-static void gtk_button_finish_activate (GtkButton *button,
-                                       gboolean   do_it);
+static void gtk_button_class_init     (GtkButtonClass     *klass);
+static void gtk_button_init           (GtkButton          *button);
+static void gtk_button_destroy        (GtkObject          *object);
+static void gtk_button_set_property   (GObject            *object,
+                                       guint               prop_id,
+                                       const GValue       *value,
+                                       GParamSpec         *pspec);
+static void gtk_button_get_property   (GObject            *object,
+                                       guint               prop_id,
+                                       GValue             *value,
+                                       GParamSpec         *pspec);
+static void gtk_button_screen_changed (GtkWidget          *widget,
+                                      GdkScreen          *previous_screen);
+static void gtk_button_realize        (GtkWidget          *widget);
+static void gtk_button_unrealize      (GtkWidget          *widget);
+static void gtk_button_map            (GtkWidget          *widget);
+static void gtk_button_unmap          (GtkWidget          *widget);
+static void gtk_button_size_request   (GtkWidget          *widget,
+                                      GtkRequisition     *requisition);
+static void gtk_button_size_allocate  (GtkWidget          *widget,
+                                      GtkAllocation      *allocation);
+static gint gtk_button_expose         (GtkWidget          *widget,
+                                      GdkEventExpose     *event);
+static gint gtk_button_button_press   (GtkWidget          *widget,
+                                      GdkEventButton     *event);
+static gint gtk_button_button_release (GtkWidget          *widget,
+                                      GdkEventButton     *event);
+static gint gtk_button_grab_broken    (GtkWidget          *widget,
+                                      GdkEventGrabBroken *event);
+static gint gtk_button_key_release    (GtkWidget          *widget,
+                                      GdkEventKey        *event);
+static gint gtk_button_enter_notify   (GtkWidget          *widget,
+                                      GdkEventCrossing   *event);
+static gint gtk_button_leave_notify   (GtkWidget          *widget,
+                                      GdkEventCrossing   *event);
+static void gtk_real_button_pressed   (GtkButton          *button);
+static void gtk_real_button_released  (GtkButton          *button);
+static void gtk_real_button_activate  (GtkButton          *button);
+static void gtk_button_update_state   (GtkButton          *button);
+static void gtk_button_add            (GtkContainer       *container,
+                                      GtkWidget          *widget);
+static GType gtk_button_child_type    (GtkContainer       *container);
+static void gtk_button_finish_activate (GtkButton         *button,
+                                       gboolean           do_it);
 
 static GObject*        gtk_button_constructor (GType                  type,
                                        guint                  n_construct_properties,
@@ -1266,8 +1266,8 @@ gtk_button_button_release (GtkWidget      *widget,
 }
 
 static gboolean
-gtk_button_grab_broken (GtkWidget   *widget,
-                       GdkEventAny *event)
+gtk_button_grab_broken (GtkWidget          *widget,
+                       GdkEventGrabBroken *event)
 {
   GtkButton *button = GTK_BUTTON (widget);
   gboolean save_in;